P02 from S99

WARNING: Copy and paste is utilized to develop new spec and test (!) Refactoring badly needed.